Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: recovery attempt + cancellation grouping #2869

Merged
merged 6 commits into from
Nov 23, 2023
Merged

feat: recovery attempt + cancellation grouping #2869

merged 6 commits into from
Nov 23, 2023

Conversation

iamacook
Copy link
Member

What it solves

Resolves #2763

How this PR fixes it

This groups recovery attempts and their cancellations together as we do with conflicting transactions.

How to test it

Ensuring recovery is enabled, queue a recovery attempt and cancel it. Observe the grouping at the top of the queue.

Screenshots

image

Checklist

  • I've tested the branch on mobile 📱
  • I've documented how it affects the analytics (if at all) 📊
  • I've written a unit/e2e test for it (if applicable) 🧑‍💻

@iamacook iamacook linked an issue Nov 23, 2023 that may be closed by this pull request
[Recovery] Transaction queue - group skipped transactions #2763
Closed
7 tasks
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 23, 2023 •
edited
Loading

Branch preview

✅ Deploy successful!

https://recovery_grouping--walletweb.review-wallet-web.5afe.dev

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 23, 2023 •
edited
Loading

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type Occurrences Fixable
Errors 0 0
Warnings 0 0
Ignored 0 N/A
  • Result: ✅ success
  • Annotations: 0 total
Report generated by eslint-plus-action

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 23, 2023 •
edited
Loading

Coverage report

St.❔
 Category Percentage Covered / Total
🟡 Statements
76.23% (+0.07% 🔼)
 10719/14061
🔴 Branches
50.69% (+0.15% 🔼)
 2180/4301
🔴 Functions
59.19% (+0.14% 🔼)
 1617/2732
🟡 Lines
77.69% (+0.08% 🔼)
 9710/12498
Show new covered files 🐣
St.❔
 File Statements Branches Functions Lines
🟢
... / useDelayModifiers.ts
 100% 100% 100% 100%
Show files with reduced coverage 🔻
St.❔
 File Statements Branches Functions Lines
🟡
... / transaction-guards.ts
76.86% (-1.29% 🔻)
 52%
70% (-1.79% 🔻)
79.01% (-2% 🔻)
🟢
... / index.tsx
86.49% (+0.77% 🔼)
50% (-2.63% 🔻)
 44.44%
88.57% (+0.69% 🔼)

Test suite run success

1217 tests passing in 173 suites.

Report generated by 🧪jest coverage report action from b4297e4

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 23, 2023 •
edited
Loading

📦 Next.js Bundle Analysis for safe-wallet-web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

⚠️ Global Bundle Size Increased

Page Size (compressed)
global 1.54 MB (🟡 +29.6 KB)
Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

Twenty-nine Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page Size (compressed) First Load
/addOwner 3.5 KB (🟢 -19 B) 1.54 MB
/apps 34.59 KB (🟢 -240 B) 1.57 MB
/apps/custom 27.12 KB (🟢 -239 B) 1.57 MB
/apps/open 26.78 KB (🟡 +59 B) 1.57 MB
/balances 26.55 KB (🔴 +5.73 KB) 1.57 MB
/balances/nfts 18.68 KB (🟡 +47 B) 1.56 MB
/cookie 8.88 KB (🔴 +2.56 KB) 1.55 MB
/home 40.18 KB (🔴 +13.29 KB) 1.58 MB
/imprint 1.41 KB (🟢 -14 B) 1.54 MB
/licenses 5.13 KB (🟢 -15 B) 1.55 MB
/new-safe/create 10.44 KB (🟢 -1.38 KB) 1.55 MB
/privacy 15.87 KB (🔴 +3.19 KB) 1.56 MB
/settings/appearance 8.36 KB (🟢 -167 B) 1.55 MB
/settings/cookies 7.59 KB (🟢 -177 B) 1.55 MB
/settings/data 7.49 KB (🟢 -176 B) 1.55 MB
/settings/environment-variables 8.8 KB (🟢 -165 B) 1.55 MB
/settings/modules 13.27 KB (🔴 +3.43 KB) 1.55 MB
/settings/notifications 12.75 KB (🟡 +1.49 KB) 1.55 MB
/settings/safe-apps 12.11 KB (🟢 -162 B) 1.55 MB
/settings/security-login 39.98 KB (🔴 +25.61 KB) 1.58 MB
/settings/setup 24.06 KB (🟢 -74 B) 1.56 MB
/terms 10.06 KB (🟢 -17 B) 1.55 MB
/transactions 52.49 KB (🟡 +21 B) 1.59 MB
/transactions/history 52.46 KB (🟡 +21 B) 1.59 MB
/transactions/messages 18.59 KB (🟡 +2 B) 1.56 MB
/transactions/queue 25.72 KB (🔴 +6.61 KB) 1.57 MB
/transactions/tx 6.26 KB (🟡 +2 B) 1.55 MB
/welcome 7.13 KB (🟢 -1 B) 1.55 MB
/welcome/social-login 7.57 KB (🟡 +1 B) 1.55 MB
Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

Next to the size is how much the size has increased or decreased compared with the base branch of this PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this.

katspaugh
katspaugh reviewed Nov 23, 2023
View reviewed changes
src/components/recovery/GroupedRecoveryListItems/index.tsx Outdated
<Typography component="span" fontWeight={700}>
Rejecting {isMalicious ? 'malicious transaction' : 'Account recovery'}.
</Typography>{' '}
You can approve or reject the cancellation.{' '}
Copy link
Member

@katspaugh katspaugh Nov 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wording is a bit confusing.

Rejecting Account recovery. You can approve or reject the cancellation.

We should call it either rejection or cancellation, not both in one sentence. On top of that, rejecting a cancellation is even more confusing.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've renamed it the following:

Cancelling the Account recovery. You will need to execute the cancellation.

@iamacook iamacook merged commit 76f0031 into recovery-epic Nov 23, 2023
7 of 13 checks passed
@iamacook iamacook deleted the recovery-grouping branch November 23, 2023 16:59
@github-actions github-actions bot locked and limited conversation to collaborators Nov 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@katspaugh katspaugh katspaugh approved these changes

Assignees
No one assigned
Labels
recovery
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Recovery] Transaction queue - group skipped transactions
2 participants
@iamacook @katspaugh